Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cli): add mcp prompt support via slash commands #1323

Open
wants to merge 17 commits into
base: main
Choose a base branch
from

Conversation

kalvinnchau
Copy link
Collaborator

update Prompt structs for align with MCP spec, add basic prompt commands to mcp-client

  • Prompts description and arguments are optional fields, use optional in the structs
    • similarly PromptArguments description and required are optional too
  • add list_prompts and get_prompt method to the McpClientTrait
  • add implementation of list_prompts and get_prompt to call prompts/list and prompts/get respectively
  • update stdio and sse clients to handle JsonRpcMessage::Error responses to send back to the user instead of doing nothing

- add new endpoints `list_prompts` and `get_prompt` in the MCP client
- update prompt model in mcp-core to make `description` and `arguments`
  optional, following MCP spec
@@ -70,9 +70,9 @@ pub fn load_prompt_files() -> HashMap<String, Prompt> {
description: arg.description,
required: arg.required,
})
.collect();
.collect::<Vec<PromptArgument>>();
Copy link
Collaborator

@salman1993 salman1993 Feb 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated to this PR: i don't think we need this mapping - https://github.com/block/goose/blob/main/crates/goose-mcp/src/developer/prompts/unit_test.json

it'd be easier to stay closer to the MCP prompt in the json to avoid this mapping (description instead of template)

@salman1993
Copy link
Collaborator

nit: you can add a prompt in the mcp-server example here: https://github.com/modelcontextprotocol/rust-sdk/blob/main/crates/mcp-server/src/main.rs. that'll make it easier to test from this mcp-client example: https://github.com/modelcontextprotocol/rust-sdk/blob/main/crates/mcp-client/examples/stdio_integration.rs

…e implementing types to define them, similar to other methods
- extend CLI input handling to support `/prompts` for listing available prompts
- add `ListPrompts` variant in the input enum and update help documentation
- implement prompt rendering in the session output module
- update agent traits and capabilities to aggregate and list prompts from all extensions
@kalvinnchau kalvinnchau marked this pull request as draft February 21, 2025 19:09
@kalvinnchau
Copy link
Collaborator Author

kalvinnchau commented Feb 21, 2025

Moved this back into a draft PR for now, since we're in progress of moving the mcp stuff to the rust-sdk, I'm keeping the commits in sync manually for now but I'll hold off on diverging for nwo.

@kalvinnchau
Copy link
Collaborator Author

kalvinnchau commented Feb 21, 2025

Added some basic cli based prompting scaffolding, mainly to list prompts and get the information about them.

Calling the prompt is not yet implemented.

Ex:

( O)> /prompts

 mcp_test
  - no_args_prompt
  - one_arg_prompt
 developer
  - unit_test

( O)> /prompt unit_test --info

 Extension: developer
Prompt: unit_test

 Generate or update unit tests for a given source code file.

The source code file is provided in {source_code}.
Please update the existing tests, ensure they are passing, and add any new tests as needed.

The test suite should:
- Follow language-specific test naming conventions for {language}
- Include all necessary imports and annotations
- Thoroughly test the specified functionality
- Ensure tests are passing before completion
- Handle edge cases and error conditions
- Use clear test names that reflect what is being tested

 Arguments:
  source_code (required) The source code file content to be tested
  language (required) The programming language of the source code

( O)>

With prompt execution support:

/prompt unit_test source_code="~/stage/unit_test/file.py" language=python
# Unit Test Generation and Update

I'll help you generate or update unit tests for the source code file at `~/stage/unit_test/file.py`. First, let me check if this file exists and examine its c
ontents to understand what we need to test.

─── shell | developer ──────────────────────────
command: ls -la ~stage/unit_test/
...

Now, let's run the existing tests to see if they pass:

─── shell | developer ──────────────────────────
command: cd /Users/kalvin/stage/unit_test/ && python -m unittest test_file.py


.....
----------------------------------------------------------------------
Ran 5 tests in 0.005s

OK

Great! The existing tests are already passing. Let's analyze the current test coverage and see if we need to add any additional tests:

...

However, we can enhance the test suite with a few additional tests:

1. Test reading a file with special characters
2. Test reading a file with different encodings
3. Test reading a large file (performance test)

Let's update the test file with these additional tests:

─── text_editor | developer ──────────────────────────
path: ~/stage/unit_test/test_file.py

kalvinnchau and others added 4 commits February 25, 2025 14:28
agent loop

Add functionality to transform PromptMessageContent to MessageContent
with proper handling in the session module and add test coverage.
Add the results of GetPrompt to the message conversation and run the
agent loop with prompt response.
fix: update process_agent_response call
@lily-de lily-de mentioned this pull request Feb 26, 2025
2 tasks
@kalvinnchau kalvinnchau changed the title feat: update mcp-core prompt to match spec, add mcp list/get to mcp-client feat(cli): add mcp prompt support via slash commands Feb 26, 2025
@kalvinnchau kalvinnchau marked this pull request as ready for review February 26, 2025 18:40
kalvinnchau and others added 4 commits February 26, 2025 13:17
- introduce `GooseCompleter` in `completion.rs` implementing rustyline traits (Completer, Hinter, Highlighter, Validator, Helper) for CLI command completions
- add helper methods for completing slash commands, prompt names, flags, and argument keys
- update `Session` in `mod.rs` to include a thread-safe completion cache with update and invalidate functionality
- derive `Clone` for `PromptInfo` in `output.rs` to support caching
- Test slash command, prompt name, flag, and argument completion
- Match assertions to actual implementation behavior
- Document edge cases in test comments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants